From 3c45a569345c6310650e4351574cb8ff8c9c421e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 2 Feb 2018 17:48:39 +0100
Subject: [PATCH] Drop gtk_widget_show_now

This function does bad things, and is not an
API that we want to take into GTK+ 4.
---
 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkwidget.c                      | 48 ----------------------------
 gtk/gtkwidget.h                      |  2 --
 3 files changed, 51 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index f519d322a3..75c71e609c 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4209,7 +4209,6 @@ gtk_widget_in_destruction
 gtk_widget_destroyed
 gtk_widget_unparent
 gtk_widget_show
-gtk_widget_show_now
 gtk_widget_hide
 gtk_widget_map
 gtk_widget_unmap
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 04218578ea..b2e80c990e 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3508,54 +3508,6 @@ gtk_widget_real_show (GtkWidget *widget)
     }
 }
 
-static gboolean
-gtk_widget_show_map_callback (GtkWidget *widget, GdkEvent *event, gint *flag)
-{
-  if (gdk_event_get_event_type (event) == GDK_MAP)
-    {
-      *flag = TRUE;
-      g_signal_handlers_disconnect_by_func (widget,
-                                            gtk_widget_show_map_callback,
-					    flag);
-    }
-
-  return FALSE;
-}
-
-/**
- * gtk_widget_show_now:
- * @widget: a #GtkWidget
- *
- * Shows a widget. If the widget is an unmapped toplevel widget
- * (i.e. a #GtkWindow that has not yet been shown), enter the main
- * loop and wait for the window to actually be mapped. Be careful;
- * because the main loop is running, anything can happen during
- * this function.
- **/
-void
-gtk_widget_show_now (GtkWidget *widget)
-{
-  gint flag = FALSE;
-
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  /* make sure we will get event */
-  if (!_gtk_widget_get_mapped (widget) &&
-      _gtk_widget_is_toplevel (widget))
-    {
-      gtk_widget_show (widget);
-
-      g_signal_connect (widget, "event",
-			G_CALLBACK (gtk_widget_show_map_callback),
-			&flag);
-
-      while (!flag)
-	gtk_main_iteration ();
-    }
-  else
-    gtk_widget_show (widget);
-}
-
 /**
  * gtk_widget_hide:
  * @widget: a #GtkWidget
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index bd64d24636..0e7a7cb874 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -403,8 +403,6 @@ void       gtk_widget_show                (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_hide                (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void       gtk_widget_show_now            (GtkWidget           *widget);
-GDK_AVAILABLE_IN_ALL
 void	   gtk_widget_map		  (GtkWidget	       *widget);
 GDK_AVAILABLE_IN_ALL
 void	   gtk_widget_unmap		  (GtkWidget	       *widget);
-- 
2.30.2